this patch is needed to strip arch-dep bits and get a multiarch -dev package.

===================================================================

Gbp-Pq: Name libpng-config.patch

diff --git a/libpng-config.in b/libpng-config.in
index 69bf8e33f0b16b73f331ec6cc98b40cddb58826c..8dc77b58e77031c9d016e5972d5bb52f1810775a 100644 (file)
--- a/libpng-config.in
+++ b/libpng-config.in
@@ -14,12 +14,13 @@
 version="@PNGLIB_VERSION@"
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
-libdir="@libdir@"
+# we disable that to make the -dev package Multi-Arch: same
+libdir=
 includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
 libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
 all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
 I_opts="-I${includedir}"
-L_opts="-L${libdir}"
+L_opts=
 R_opts=""
 cppflags=""
 ccopts=""
@@ -33,7 +34,7 @@ Usage: $0 [OPTION] ...
 Known values for OPTION are:
 
   --prefix        print libpng prefix
-  --libdir        print path to directory containing library
+  --libdir        print path to directory containing library (disabled in Debian/Ubuntu)
   --libs          print library linking information
   --ccopts        print compiler options
   --cppflags      print pre-processor flags
@@ -84,6 +85,8 @@ while test $# -gt 0; do
         ;;
 
     --libdir)
+        echo >&1 "$(basename $0): --libdir option is disabled in Debian/Ubuntu"
+        exit 1
         echo ${libdir}
         ;;
 

diff --git a/scripts/libpng-config-body.in b/scripts/libpng-config-body.in
index 181984b4b430df2b596f378642d0bdebb6791b3a..98af2701f4eb82e260d95ede5dadc38a7a8396dd 100644 (file)
--- a/scripts/libpng-config-body.in
+++ b/scripts/libpng-config-body.in
@@ -6,7 +6,7 @@ Usage: libpng-config [OPTION] ...
 Known values for OPTION are:
 
   --prefix        print libpng prefix
-  --libdir        print path to directory containing library
+  --libdir        print path to directory containing library (disabled in Debian/Ubuntu)
   --libs          print library linking information
   --ccopts        print compiler options
   --cppflags      print pre-processor flags
@@ -57,6 +57,8 @@ while test $# -gt 0; do
         ;;
 
     --libdir)
+        echo >&1 "$(basename $0): --libdir option is disabled in Debian/Ubuntu"
+        exit 1
         echo ${libdir}
         ;;